Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add OS Thunderbolts #4062

Merged
merged 9 commits into from
Dec 22, 2022
Merged

Add OS Thunderbolts #4062

merged 9 commits into from
Dec 22, 2022

Conversation

SJuliez
Copy link
Member

@SJuliez SJuliez commented Dec 20, 2022

Fixes #2177

Adds OS/IOS Thunderbolt versions for construction and use, tested in MML and MM.

To reduce code duplication this expands the hierarchy of Thunderbolts. ThunderboltWeapon -> Thunderbolt##Weapon -> Thunderbolt##, Thunderbolt##OS, Thunderbolt##IOS where ## is the rack size.

@HammerGS The TechAdvancement for the normal Tbs is probably ok, but would you be able to help me with the TA for the OS and IOS. I copied in some TA from another OS weapon but that's probably off in some way.

@SJuliez SJuliez added Errata This covers officially produced CGL errata that the programs need to implement. For New Dev Cycle This PR should be merged at the beginning of a dev cycle labels Dec 20, 2022
@SJuliez SJuliez requested a review from HammerGS December 20, 2022 09:12
@SJuliez SJuliez self-assigned this Dec 20, 2022
@codecov
Copy link

codecov bot commented Dec 20, 2022

Codecov Report

Base: 23.00% // Head: 23.02% // Increases project coverage by +0.02% 🎉

Coverage data is based on head (0512a02) compared to base (8ff7917).
Patch coverage: 80.64% of modified lines in pull request are covered.

Additional details and impacted files
@@             Coverage Diff              @@
##             master    #4062      +/-   ##
============================================
+ Coverage     23.00%   23.02%   +0.02%     
- Complexity     4813     4825      +12     
============================================
  Files          2264     2276      +12     
  Lines        249505   249591      +86     
  Branches      46325    46327       +2     
============================================
+ Hits          57398    57473      +75     
- Misses       190648   190659      +11     
  Partials       1459     1459              
Impacted Files Coverage Δ
...gamek/common/weapons/missiles/ISThunderBolt15.java 100.00% <ø> (+16.66%) ⬆️
...egamek/common/weapons/missiles/ISThunderBolt5.java 100.00% <ø> (+16.66%) ⬆️
...k/common/weapons/missiles/Thunderbolt15Weapon.java 42.10% <42.10%> (ø)
...k/common/weapons/missiles/Thunderbolt20Weapon.java 42.10% <42.10%> (ø)
...ek/common/weapons/missiles/Thunderbolt5Weapon.java 42.10% <42.10%> (ø)
...k/common/weapons/missiles/Thunderbolt10Weapon.java 47.05% <47.05%> (ø)
megamek/src/megamek/common/WeaponType.java 84.05% <100.00%> (+0.09%) ⬆️
...gamek/common/weapons/missiles/ISThunderBolt10.java 100.00% <100.00%> (+12.50%) ⬆️
...gamek/common/weapons/missiles/ISThunderBolt20.java 100.00% <100.00%> (+16.66%) ⬆️
...ek/common/weapons/missiles/ISThunderbolt10IOS.java 100.00% <100.00%> (ø)
... and 13 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Member

@HammerGS HammerGS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

…olt_OS

# Conflicts:
#	megamek/src/megamek/common/weapons/missiles/ISThunderbolt15IOS.java
#	megamek/src/megamek/common/weapons/missiles/ISThunderbolt20IOS.java
#	megamek/src/megamek/common/weapons/missiles/ISThunderbolt5IOS.java
#	megamek/src/megamek/common/weapons/missiles/ISThunderbolt5OS.java
@SJuliez
Copy link
Member Author

SJuliez commented Dec 22, 2022

I looked at IO and the advancement tables some more and I improved the TechAdvancement some more. So now ready to merge.

@SJuliez SJuliez marked this pull request as ready for review December 22, 2022 12:34
@Windchild292 Windchild292 merged commit 0f7910c into MegaMek:master Dec 22, 2022
@SJuliez SJuliez deleted the Thunderbolt_OS branch January 6, 2023 09:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Errata This covers officially produced CGL errata that the programs need to implement. For New Dev Cycle This PR should be merged at the beginning of a dev cycle
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Thunderbolt OS Weapons need to be added.
3 participants